Added to all tests, fixed small bug in test