Made tests more readable, expressive