Updating tests to work in new structure