Add initial unit-tests