Fixed ci
Improve testing