Fixed test module names
Made better decktutor resolver