Build vars and minor test correction