bug fixing; separate the demo SUT and the demo testapi
merge