fix tests again, and make sure we return (even an empty) array when the handler is active