fixtures and functional tests fix