EMC: Add some creation-time validity checks
Streamline tests
Restructure new functions