Minor changes.
Added some basic testing.