refactored tests, added refactored_tests folder