[Bug 984315] Tests update