Working on performance tests