Changing file names to have quicktest work correctly

Also staying with underscore standard
Merge pull request #1119 from palantir/quicktestFix

[Quicktest] - Changing file names to have quicktest work correctly