Commit 600d8dbf6dccff5a9d86dd5ae01a53de46471796

Ben Straub 2013-01-03T09:10:38

Move test cleanup into cleanup functions