test clean up and enhancement