Another testcase and some cosmetics