Fix build break and add performance tests