WL-3014 (Test fixes)