Progress on model and added tests.