Implement testing to ensure refactoring within #30 goes well!
Implement testing to ensure refactoring within #30 goes well!