major refactoring for tests
Merge branch 'master' of github.com:NixieAgency/edac