Started on unit tests