Further cleanup. Added some bad option tests.