Update testfaelle to match the ideas discussed in the meeting