option names should work fairly well
fixed all tests except two (added todo comment on the tests that fail and why)