CFY-1303: Update tests to 3.1m4