ObjectManager annotation

* Annotation
* Resolver
* Tests
* Documentation
* Edited some tests as were incorrect