rm caveats and update test