Improve unit test code coverage some more
Fix some rakefile issues
Improve unit test code coverage further
Add more unit tests