Added Fixed Test for Project and Task
This adds the project/tasks cleaning of tests to master. Reviewd already in other branche, cherry picked to master.
This adds the project/tasks cleaning of tests to master. Reviewd already in other branche, cherry picked to master.