more whittling away ... plus memory leak tests