new_collisions: fix tests and revert town to regular