Some test improvements for #90