Make logout tests JSON based
Merge branch 'master' of https://github.com/GU-2013-TEAM-M/eos