[GAIA BUG997599] - Working tests
Merge pull request #314 from michalbe/Bug997599-temp

[GAIA BUG997599] - Working tests