Partial fixing of unit tests