Adding further c++ tests. Re-adding generation of test model to make all, since it causes problems with eclipse otherwise