bug 834961: addressing review comments, and fixing window-utils tests