more Garret error fixes
test cleaning