refactored tests into more practicle org