GPII-672: Working on getting all tests to pass again after merge with master