add Core/Service tests and clean some other