otec: refactoring and new failing test (currently on @Ignore)