Fix merge conflicts and some test cleanup

I was not able to reproduce the failures you mentioned with the projects integration tests. Are they still happening for you?