Remove commented out test setup code.
Remove custom test timeout.