Added Demo on Page
Added some unit tests