fix/improve fixtures schemas