Configuration and basic tests
Remove commented out code
Remove throws an exception if the key hasn't been defined
Basic suite of tests