sample of refactor for fluent interface
add and fix more fluency
some more
make partner more fluent and fix test
more fluency