removed some old comments; renamed a package in test to be consistent with package in main
Authored by: michaz 2014-05-27
Parent: [r29127]
Child: [r29129]