bugfixes to tests...