Fix failed test
Cleanup test