test cleanups

fixes #26