changed testing to follow new structure