Finish tests, etc...

Lapp doesn't work yet