Fixed concurrent mod exception in observer manager mock and removed unnecessary class