Switched from a test app to some unit tests.
Added a few more unit tests.