Fixed tests that were broken with project validation