Clean up old test, pass all tests