Fixed tests for ba08ede changes