Unit Tests

- qw is not qq.  Cleanup now happens properly.