Added some tests and updated coverage.