try to improve the failing tests