atest: cleanup