Test helper fix