[Bug 996527] Fixing 2 more tests
Merge pull request #255 from michalbe/b6527-nfc-temp

[Bug 996527] Fixing 2 more tests