Add util tests

This brings in the `util` tests (the easy part of #3).