Bugfix in tests