Started work on unit tests