Increase test timeout, misc. cleanup