Updated functional_tests to be equivalent to chapter06 of the book