fixing tests, adding demo