Test, clean up, refactor all models