refactored tests to make them more understandable