Add test, slimmed caveats