Add more util tests, fix one bug test found!