[GAIA BUG1018819] - Tests fixed
Merge pull request #327 from michalbe/Bug1018819-temp

[GAIA BUG1018819] - Tests fixed