Fixed unittests, changed structure of demo