Make the test more robust, or try to