Cut down on cruft using ScreenAdapter
Organize imports in TestBattle and get rid of the tag manager..