- refactorings & test fixes