fix some tests that were failing with devise and other tweaks