increasing timeout for server start
and fixing matcher for success