Working on some performance tests