tix/tests/cleanup
