Finishing test coverage for iteration 1-2. Passes 85%