2nd attempt at fixing unit tests