Updated test to work with new structure