fixing tests to conform to new structure