cleanup unit test

For your review