[GAIA BUG935636] - Tests fixed
Merge pull request #305 from michalbe/Bug935636-temp

[GAIA BUG935636] - Tests fixed