Add performance tests, update utils