Task/add unit tests

#### Reviewers
@jframos @flopezag

#### Description
ADD unit tests

#### Test
tested locally 
?