further tests fixed