API cleanup, tests for Configuration