Refactored tests
merged