updated tests and codes so that variable definitions matched new TOML configs, build Array merging still needs to be done