Order fixture test and implement session clean up