Add more tests
Format