Removed two big unit tests to fix the build.  (Used too many c++09/11 features like "auto" and extended initializers.)