Lighthouse 957 patch

Some tests were fixed since my last pull request for this issue, could you please reconsider? Please see Lighthouse for details.