fixed further tests for 3.0