Cleanup test
Code format