Make bok_choy tests clean up test files before executing
Merge pull request #6313 from cpennington/bok-choy-clean-mako

Make bok_choy tests clean up test files before executing