Unit tests and coverage

[tracker1]

Need to add unit tests and code coverage.

[tracker1]

This is now very important in order to publish the most recent changes, this really needs to be refactored more, re-tested and a few other pieces.