A little more unit testing.