fix minor problems due to merge with feature_unittest_connection banch