Add fixes for tests