Fixed tests broken by last commit