Made some changes to remove failing tests executing.