Move rewritten unit test to proper location.