Fixed Problems with some performance-tests.