Fix strict mode short flag

Also fix tests.