restructure tests corrected
Added some sorcery