Add unit tests (not all, just begin)