Fix testing and ci