Make all methods use basic then/catch/etc low-level methods. Add tests for nonStrict.