move clean-up resolve() into test!