Added resource test and moved step defs into own dirs for clarity