Updated tests
Final EMS commit

Fixes #1