Staged: Update for new tests and changes for engine