Reworked the Test recording structure as per @mkm1879 suggestions. Issue #3