Corrected test name
Merge branch 'master' into issue7