Removed two unit tests to fix the build...

... used too many c++09/11 features like "auto" and extended initializers.