Add tests to check embed using data plugins
Remove un-necessary custom class