Fixed tests by making them a bit more generic. Accurately measuring by result length is a bad idea