Cleaning up atomic tests