Fixed failing tests (bug 793914)