Merge branch 'release/2.2.0.4' into develop
Add a setUp method back to another base test thats missing it.
2.2.0.5
Merge branch 'release/2.2.0.5'