Refactored setup file and foo to be more test friendly
refactor setup file