new tests and fixes for the models

includes an ugly hack around variable freshness that needs to be fixed