Fixing up failing tests