Vikram | code review comments | removed unused variables and added test