[GAIA BUG984584] - Final tests
Merge pull request #288 from michalbe/Bug984584-temp

[GAIA BUG984584] - Final tests