Retry test and other misc. modifications