Fixed compile errors (by commenting out some problems in a new test file)