Added more unit tests
Fixed formatting