Tests and Proposed Restructures