added some factories, simplified spec setup