Conflicting tests renamed to allow for compile.
Merge remote-tracking branch 'origin/master' into master5
Merge pull request #3 from kgashok/master5

Conflicting test names renamed.