— Small refactors and doc updates
— Reverted some architectural changes on Unit tests. They did not allow individual test running