Update some model behavior + add some extra supporting tests