Tests fixed for perl 5.17