Updated AutoFixture to 3.10 and done a small refactoring