Commenting out unused/moved test lines 250-620