Cleanup
Add junit test on scheduled services