Refactored tests to test new structure