Including test fixes. Few more places referencing atomix version Change-Id: I48fb8fa255624a86ae12117845603f7d53f1c29e