Merge "Re-enable tests 934 & 935"