Working on unit tests
unit tests functional