refactored tests
34 files changed