disabled timeout test and fixed another