improve test-coverage & fix minor issues, add service to delete old entries