Update tests
Update tests, add Basic provider