Multiple fixes in collection and models in order to pass most unit tests (still some are failing).