build file fix
fix tests which assume a certain order, that is not guaranteed