added some factories and re-factored feature specs