Some test fixes/loosened error bounds.