Fixed Ecology tests to match the refactor