changes on chapter5 - new unit test, changes on functional test
refactoring on functional tests