File entries and block cache in working state, some tests passing again