fixed timeout, added tests
fixed timeout, added tests