Added docstring
Changed basic_model API and removed a test that no longer applies
Added docstrings