Merge "Fix last unit tests on py34"