adjusted tests for 2.0