reverting temp import module change
adding tests
Merge branch 'fixInheritance' into develop