Little cleanup, one more test!