bugfixes to tests..
bugfixes