Remove usage of deprecated _scheme and instead correctly use array of schemes

Also adjusted the dumper to dump the correct data

I also extended the tests to not only test the deprecated behavior.