Finished moving my test code into the BYU solution