syntactical changes to restore compile. uncomment some tests.