Fix CI tests (before and after script breaking)