Fixed to support ae changes. Moved test-data-generator to sensor