adjusted fixtures and functional tests