fix and expand tests

After the latest developments some tests are broken, due to the modifications.

We should fix the tests that fail and introduce more, so that we can start covering integration testing too.