Added index and acceptance tests.