Improved tests
Updated Demo
Updated test suite