Fix tests
Fix coding style