rewriting the tests...
Merge branch 'develop' into feature/test_refactor
simple fix to get this functional
minor test improvements
Merge branch 'feature/test_refactor' into develop
more junk