Removed some hard-coding from the functional test. Now current with book, page 56.