clean up plugin renaming, add flags for integ/func tests