fixing tests for recent commits