Tests updated
Unnecessary files removed
Model updated