Remove un-needed test class properties.
Merge branch 'tests' into develop