-implemented and improved some performance-tests