Misc changes across the project. Added yet-empty test cases, and structural elements.