Test cleanup

Removes unnecessary code in scripts and fixes outdated code comments.