cleaning up, getting test working