Update TestStep, FileHandler, and their tests

Update to TestStep, FileHandler. Add/updated corresponding tests. Added vim swap files to .gitignore.