Update SAMPLES and testing

We have to take a look at the 'for SAMPLE in $SAMPLES'-loop. The group is going to discuss this in the meeting on 2014-12-12.