Fix test errors and resume org menu