Start fixing unit tests