forge tree refactorization; SOFTWARE_UNDER_TEST variable