Added some limited unit testing.