slightly greedier about combining chunks now, and beefed up tests