Improved the solution for RF-13706 and created a unit test
Added some comments to the test for RF-13706, and changed the timing.