testing moving to a , rather then custom service