Lil cleanup + view/relatedTarget tests