replace deprecated escape method
increase timeout
add query string tests