I pulled down a copy of the code and used the suggested find I pasted above, along with removing to_param from user and that worked for everything except the one admin test.