fix tests for recent changes