Why are lots of these expectations commented out?  Shouldn't they be removed if they are not relevant?