Again, 'Testing' cleanup