additional test and cleanup