Completed Functional Tests

Ransom and I have completed our changes highlighted during Friday's code review.