WIP fixing tests on current as array [ci skip]