More CI config
Some test clean up