Corrected tests for 2.0 RC