Coding done, start working on unit tests