Fixed format
Added test cases