refactoring tests into more understandable classes