added verify/clean-up tests