It seems like these tests were never run during the development of 30747cfe41f5d4f0b0083750ba9c20cfcccec117, which proceeded to break them. This patch updates the tests to correspond to the changes introduced in that patch.