Merging into testing branch

Classes module models.py is now fully tested