Finish writing tests for bug 961365