Added CLI to unit test suite, fixed schema CLI.. converted VF_Singleton URLs to dependency injection