Spaces to Tab

Changes indentation from spaces to tab and made some aesthetic cleanups.
Semi-fix for 12

Test 13, 14 successful. Test 15 alternates between pass and fail. This
fix makes Test 17 consistently successful (before alternated), and will
allow Test 12 to succeed once. After running Test 12, most tests will
block for some reason. Test 6 'flakiness' not yet looked at.