Tests and fixtures update

Andrey Veltischev requested to merge change/fixtures_and_broken_tests into master
  • Update fixtures data
  • Slight refactoring
  • Skip broken test

Merge request reports