new tests fixed up to line 144