finish models and tests