test failure fix
test resources cleanup
test code cleanup
minor code change
Merge pull request #58 from psakar/master

test failure fix