Add unittests
18 files changed