Issues #167 #168 completing the model test