Switch tests to pass salt length to the right place, except where actually testing the deprecation support