Multiple changes to functional test and unit test. Now at CH05.