final tests fixed