refactored tests
Merge "refactored tests"