Add index and testapp