Added addiitonal tests and object manager methods.