Added unit tests. More to come.
Makefile target 'test' now correct