Trying to refactor ensemble tests - they're a mess

We need to make each test not depend on the previous test