Fixes more define issues with performance test