fixx some tests