Tidied up FunctionalTests. #45