Reverted doubleinblock
Added new functional tests