Clean up some specs and factories, remove unused helper