WIP on testability, improved collision resolution