Some more tests and cleanup of option asserts.