Adding more tests and Demos