Bump timeout for tests
Add simple implementation for 'best-fit' locale matcher