pulled test class from html tag
Merge branch 'master' into src