Kill empty test.

Rebased from master