Added diagnostics to sample test