Improved integration tests

I made the first step in improving the integration tests, we are now testing more features.