Added file support for tests
Merge pull request #21 from kotlinski/fix/more-tests

Added file support for tests