adjusted tests for new structure