Revert "Comment out failing tests"

This reverts commit 0593ee74f9eedcd41aaae12cca3fe8ff2d0d1759.