add some more expect_... stuff to test