Moved testers into separate helper file
Made filepath more robust
Reverted to previous