fix bug in two-ts
add a lot of tests for kills/gens