Add unit tests
6 files changed