Fix up the test.
Active development, DO NOT PUSH.