[GAIA BUG997599] - First tests
Merge pull request #312 from michalbe/Bug997599-temp

[GAIA BUG997599] - First tests