Update on unit tests