Redesign of the test automation data model by Y. Khambia