Test clean up (#255)