fixes required by tests