Test coverage updates
Fix error for mixing class with instantiated module