More manifest work and tests