explode fixes + tests