Fiddling for #33.
Attempts at test improvements