indexes fixed, test made runnable