s/build_for_self/selfref/
sort out and restructure options and related changes in test cases