Update App Based on PR Response - Specifically Relocating Several Tests and Adding a Couple New Methods