faster and more robust testing; fix error case for 0.8