Broke out tasks, added test target.