Merge pull request #32 from md-systems/8.x-1.x

Fixing more tests