working on more tests
cleanup files
Merge latest changes from master
Merge pull request #8 from MSOpenTech/dev_test_coverage_improve

Additional tests and cleanup to improve test coverage