Fixing up some tests