Bug 977337 - Fixing broken gaia unit tests