No more tutor.pl warning
Fixed sub wrapping, removed test messages