Fixed tests as a result of last PR