Adding initial unit-tests