changed tests to reflect new structure