removing timeout and fixing test