fix demo to work
fix test