BVTCK-32 Incorporating review remarks
BVTCK-32 Marking tests failing on RI