Testing: Return failure from OK1() and other fixes.