full testdata now used
additional output added; unneeded if clause removed