Update some unit tests to handle changes made in code over last couple of months