[GAIA BUG984584] - Remaning test suite
Merge pull request #287 from michalbe/Bug984584-temp

[GAIA BUG984584] - Remaning test suite