Fix tests for latest pull request contribution