Existing functional tests should now work