More demo and test cleanup and improvements