Added more tests, haven't found source of problem yet.