Add cleanup from test