Fix self-tests to look for "client.browser" instead of "client" program
Add a longer timeout for some self tests