Performance updates and dummy class for comparison. Updated unit tests