more testsuite
minor tweaks to testsuite
minor tweaks to testsuite