fix #959 & re-enable tests