fixes for better explode/keep handling
adjust tests