Fixed up some of the test imports and one issue in the Module file