Added cleanup code for test