Add options tests

Don't merge yet. Have not found a test that was failing and fixed.