Rearranged things
Added simple require test