Update tests for marked for later move