Few new tests cases, again enabling previously disabled ones