And another bugfix for test environment