fix some tests - don't merge yet