Refactored test file names
Refactored strings in test to be single quoted when there is no interpolation