Added timeout to initializer and tests