adds test that working dir does not getting larger or smaller...
refactors all of the things