Functional tests broken out into a more logical file structure