Fixed up unit tests for changes in 205715d298cdb6920