updated tests and demo