Add test: and an util index