added ews2 tests and cleaned ews1 [merge]