nose test additions, improved code coverage