client tests edited & generic null check method added