More ruby cleanup to get remaining tests running