FACES-1846

Fix tests for 3.0.x-legacy branch