Removed obsolete binds & timeout for tests.

Clean up.