Add the rest of the indexes and feature tests.