Small performance fix
Test changes.