APIntify a test which is potentially unsafe otherwise, and fix the