Unit tests

Starting work for issue #6