Improve coverage of the functional test a bit