reworked many-a-files to remove external dependancies from unit tests