Improved tests.
Added coverage.