Fixed tests broken by merge from Leons branch