tests: correct behaviour from array to scalar variables

Some variables have changed from a single array to multiple scalar variables. The amended tests will now reflect this.