Methods are now ordered alphabetically to make tests easier to write and maintain