Adding more tests.
More util tests.