Adding initial unit tests