Fix testing race condition, more ci changes