Adjust unit tests