Increase session time-out to two-weeks, clean-up authentication assets and fix testing hack