Fix specs take 2

Ok more unstubbing to get these guys to really pass. Thank you rspec --seed XXXX for finding the issues.