added tests for singleton model. added tests for each model that should ...

...now use it. Fixes #350