Started to work on unit tests