Fixed tests broken by previous commit