Tests are working again!

Now I need to fix integration tests