fix some tests...