Joe & Chloe | Fixed tests