Eraser tests, bugfixes from Touchpoint