Updated tests and CI setup