More work
Interface refactoring + some tests (coverage 54%)