Changed Unit test case,Code formation,variable name changes

Signed-off-by: Jay Patel <jaypa@cybage.com>