fixed some tests for 2.0