Update the unit tests to give it more coverage

Now with Good code coverage.