Fixing a redirect.
Adding functional tests.