Added a bit more tests for correctness and code coverage.