Ninja test, minor reordering of definitions
Ninja test, minor reordering of definitions

ndmitchell/shake,ndmitchell/shake,nh2/shake,ndmitchell/shake,nh2/shake,nh2/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,nh2/shake,nh2/shake