living in the new Option based world
adjust the tests to the new world