Fix two tests, and rebuild the engine