Adds multiple providers as well as some tests