fixed current tests that were failing do to module location change, this is temporary to fix state of repo till all the new tests are complete