fixed last two failing tests, all devise test now works