All in-use unit tests now passing after merge