reordering use statements
fix some more left overs and tests
Merge pull request #7 from immersivelabs/fixtests

Fixtests