Re-ordered dropdown menus

You previously had to select type after selecting the test/dugga which
felt illogical.