Adds configurability and tests.