Merge pull request #192 from arpitgupta/working

rename test class to have Test in the name so it runs
rename file to have Test in the name
Merge remote-tracking branch 'upstream/master' into working