Fix devise test issues