BVAL-343 Applying patch and updating tests