Make the functional tests more informative