NOREF: Adding test limits manifest
NOREF: Merge updates