Bugfixes.
Small fix in tests.