Uncomment out some tests