Removed two inconsistent tests

EV-73
Fix various unit tests broken by recent refactoring

EV-73