Reenable unit test in its proper home