[Olena-patches] milena r3439: Adjusted tests for new opening/closing naming scheme