Now that we have envsubst in the build container, we can simplify our scripts a bit. Also do other cosmetic improvements in the test scripts. Signed-off-by: Utku Ozdemir <utku.ozdemir@siderolabs.com>