More demo and test cleanup and improvement