Formatting change only
Fixed some test cases