wip
Merge pull request #9 from immersivelabs/fixtests

wip