Started to write unit tests