commented out some tests