improve and refactor models specs

Closes #59