Improves tests, changes with to where