Refactor test setup: 53% passing and much faster