CI tests improved