Another minor change for consistency
Move test for #54 to the right place