Add more tests & some work in services.yml