Fixing up more tests