fixing some service tests with db data changes