improved fill tool tests