Attempted to fix project-builder
SLT-307 refactor and fixed projectBuilder with corresponding integration-test, also added a new test to test the where clause of the projectbuilder which wasn't tested before