More expressive test; bugfix.