CI Integration + Refactoring the tests and bringing them in shape