Bug 903260 fixes tests, a=test-only

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>