Adds testing
Simplifies code changes