FIX: Fix escaping of test data to suit a security change made to 2.4