bulk tests passing

Change-Id: Ib0b2b8b61c788ffafee7f4e4e283ae8be84c2a7c