#67 fixing up for all tests
ignoring tmp/ directory
trying out easier test format
Merge branch '1.3.7' into issue_67