tightened up loaded dependencies.
improved code comments.
Merge pull request #581 from stopfstedt/unit_test_cleanup

Unit test cleanup