refactoring tests
starting cleaner test (not functional yet)