Small adjustments in tests. Some ideas to scratchpad.txt