Tests
Refactored tests to the same package