[Issue #171][WIP] finished model tests