minor cleanup for tests
Fixed #34