fixes + Model tests