suppress test + minor clean-up