minor bugfixes to tests.