Fixed concurrent mod exception in observer manager mock and removed unnecessary class
Merge branch 'observers' into master-fixed