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

Also staying with underscore standard