re-enabling tests, predictably there are bugs