Functional test fixes and fix for creating non-partner project

What, @rollick , you left commented code?