This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support.