Added Services and Validation tests from OST-Todos