removed canonical.pl from test suite, do raw diff -u, many changes to test suite...