[Bug 996527] Fixing 2 more tests