Bug 1080219 - Fix broken tests, add comments