Updated tests and prepared for CI setup