Fix a couple of collision bugs
tweak time test numbers