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

Fixed tests