Reverted the return request and also, removed static from variable causing test failing.