Updated testsuite and made minor changes to rulefile.