Fixed 2 BaseModel issues missed before
Some test fixes