XD-1749 un-ignoring some tests, removing others