Commented out old tests that are broken with current master.