Fix broken tests.
Make model more convenient.
0.1.2