Removed some failing tests missed in 1556b1c3b7a18cadf4d66d2ab6301d7fe8646ba5