Finish 8.2.6 Signing out, also fixed a misplace 'end' that was causing failing tests.