Fixed test, added convenience.