Start working on unit tests