refactor tests to be more modular
Merge branch 'feature/test_refactor' into develop