Extra test, a couple of tidy-ups