787415ae94
The previous change
268b4297b4
did not move the rest of the functions required to actually run the
test case.