Add make test_add and todo for more tests
Update labels for some demos