John, Utsab | tests for diagnosis validation & minor improvement to setup test data