modified tests to go faster *and* work