Refactor destroy test and cleanup formatting
Merge remote-tracking branch 'origin/Auth' into Auth