Add more tests
Fix formatting