FACES-1848

Fix tests for 3.0.x branch