Updates to make XGAP compile again, also the unittest works again. closes issue #32