amend tests for devise removal