Added two tests
Finished unit tests of c++ and non-django
Added more tests