Fix broken tests for last commit