merge fixture and timeout into core