Fix some tests :balloon: