cleanup and extra test