Improved build variables and test environment privacy
Fixing directory inconsistencies
Re-adding real directories