Dileep | Optimizing registration test -- takes 17s