Feature/test fixes

Two hotfixes for tests.