Updated Base model manager
Added test