Began work on unit tests