Add timeout of 15s to tests