got most of the test working