smartxml: Integrating old tests from canvas api (keeping entities)