Finalize test fixes for best practice changes