Merge "Re-enable 3 unit tests" into feature/zuulv3