[fix] fixed tests to reflect change of core schema
[enhancement] improved builder hierarchy
[enhancement] added schema for Service Provider Config