bug fixes and reorganization of model.managers
tests
updated tests