Unit test changes.
Improved unit testing coverage. Almost at bar.