Perlito5 - XS - organize tests a bit