modified new tests for new structure