tests fixed even better