Changed naming of some tests to make it more readable