+ Models

Few more models and tests