Reorganizing to better suit framework specifications, simplified test cases specifically for deliverable 3.