fix several tests
fix logout