Use builder classes to simply index tests as well