Bug 931152 [v1.2] Added missing tests from master.
Merge branch 'bug-931152' of github.com:s-dehaan/gaia into bug-931152
Bug 93112 [v1.2] Added missing tests from master