Indention is inconsistent between app and tests

Editoconfig says 2 spaces, app code uses 4, tests use 4. Since the majority uses 4 I updated the tests and the editorconfig to reflect that. Let me know if you'd rather have it the other way around.