Fix the unstable build and assert a couple more things in a test.