Bug 916819 - Respond to review comments; add some tests