refactoring, unit tests, wiring validations