Clean up unit test + Fix coding style