Fixed compilation errors, improved intersectiontest 5 and differencetest 5