Fix minor bug
Fix some issues
Merge pull request #1161 from TechEmpower/fix-run-tests

Fix run tests
Merge remote-tracking branch 'upstream/master'