Stricter CI scripts