Fix finish
Fix test logout