Add throws IOException in index code, tweak broken test, fixes due to method signature changes