tests && demo fix