Bug 945192. r=rstrong
Bug 945192 - Changes for tests. r=rstrong.