garbage files deleted
some tests fixed