Updating test so they pass without timing out