Updated fixture for functional tests