more work on logout test. Made tests multi-file test case compatible