making test easier to read
staying closer to requirements
refactoring for consistency