Get rid of hardwired counts in assertions