Revert "Add missing test dependency and use a more canonical target name."