Restore projectbuilder

Made "where" builder-option not mandatory in projectBuilder and made ProjectBuilderTest handle enabling and disabling projectRefs. Please review