Added new test and updated existing ones for demo