enhanced fluentbuilder command and more tests