Added more test and improved demo page