1.0 RC 1 - Fix unit tests from hanging on Travis