Added index test, first working version