mappings fixed
fixtures updated