disposal tests fixed