refactored datafixtures namespace