More Structure edits. Tests currently commented