finish test suite  and fixes for gridmodel and gridmodelbuilder