Fixed more failing tests