I'm with you, just copied parts of original PR. assertEquals seems reasonable to me but needs a lot of change, i'll try it.