Bump version; update NEWS
merge conflicts
Fix test; safer test error exit strategy