make tests and integration tests work again