fixing code formatting
Adding some more unit tests.