Functional testing

New pull request to see if Travis picks it up.