restruct
Added 2 working test