Chris's Refactoring

Changed the June and March Tests and methods