Modified tests to make more readable