Updated to new ModelCC interface
Updated test suite in build.xml