Fixed the path on a ModuleManagerTest to expect the correct thing
Merge remote-tracking branch 'origin/api_build' into api_build