Working on unit tests.
Working on unit tests