Cleaning up some tests by using assertHitCount assertion