Re-added uncommented tests.