integration of Simon's remarks + continue with Arr tests