Fixing up some tests.