add tests for Core/Service + Cleanup