Moved Mock expert to test resources
Removed DataTypes dependency