Minor simplifications.
Beginning of test suite redesign for better redability and less brittle
tests.