Improving test coverage, adding more tests.