Updated models and corresponding tests

Please add that as a comment for other devs in the code please.