Commented out outdated test lines