Abstracted the functions into a common class to reduce code duplication
and begin steps towards making an automated runner for each test!
--Mostly needed for further use of code since it helps encapsolate
current codebase