Added more demos/test cases