Updates from unit tests